batman-adv: Provide teardown hook for batadv_vlan proto

The batadv_vlan proto doesn't need to do anything when it gets teared down.
But the scripts are still trying to call the teardown function of this
proto. This results in warnings like:

    daemon.notice netifd: batmesh1 (18940): ./batadv_vlan.sh: eval: line 37: proto_batadv_vlan_teardown: not found

Just providing a stub function avoids this log spam.

Fixes: #1044
Reported-by: Rani Hod <[email protected]>
Fixes: f5205d7d2434 ("batman-adv: upgrade package to latest release 2014.2.0")
Signed-off-by: Sven Eckelmann <[email protected]>

diff --git a/batman-adv/Makefile b/batman-adv/Makefile
index 03459113c993bd251f98ea07dd16eac72aa8efca..253f7c7dfa64008b7126f0f1f7f86c073d350703 100644 (file)
--- a/batman-adv/Makefile
+++ b/batman-adv/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=batman-adv
 PKG_VERSION:=2023.1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)

diff --git a/batman-adv/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv/files/lib/netifd/proto/batadv_vlan.sh
index 115e61cde75137d62f236fe6391b696ad76e307e..5b0c76fd2efcdeb46765792dcbb43c741665372b 100755 (executable)
--- a/batman-adv/files/lib/netifd/proto/batadv_vlan.sh
+++ b/batman-adv/files/lib/netifd/proto/batadv_vlan.sh
@@ -22,4 +22,8 @@ proto_batadv_vlan_setup() {
        proto_send_update "$config"
 }
 
+proto_batadv_vlan_teardown() {
+       local cfg="$1"
+}
+
 add_protocol batadv_vlan